Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 17 Jul 2011 00:39:01 +0000 (17:39 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 17 Jul 2011 00:39:01 +0000 (17:39 -0700)
commit8c417db4aee7fe00a76790aabb8fe70865676acb
treeaad0332c9bb039dfab6f22f7970137caddcb64b9
parentb310d0b560e0e6f081d7f344e7ab35cd79fff722
parentef3747d847062b0338a46b609177793ea14e8d97
Merge from trunk.
src/ChangeLog
src/xdisp.c